tools/firmware: Rename bios.bin to seabios.bin

bios.bin as a name is far too generic.  Rename it to seabios.bin.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
[ wei: fix up conflict, rerun autogen.sh ]
Signed-off-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/configure b/tools/configure
index 998090afb30ee8e76998a7c55132db456c6a1d83..7b223051a0330d3e10b010e155d76b0d177e1abc 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -4453,7 +4453,7 @@ if test "x$seabios" = "xy"; then :
 
 
 cat >>confdefs.h <<_ACEOF
-#define SEABIOS_PATH "${seabios_path:-$XENFIRMWAREDIR/bios.bin}"
+#define SEABIOS_PATH "${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"
 _ACEOF
 
 

diff --git a/tools/configure.ac b/tools/configure.ac
index 1fb4a55b85d82e5d3ed3784168ab5d29a08e248e..f010d7233ee6eb649de941e8f44fc17d9b4560df 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -224,7 +224,7 @@ AC_ARG_WITH([system-seabios],
 ],[])
 AS_IF([test "x$seabios" = "xy"], [
     AC_DEFINE_UNQUOTED([SEABIOS_PATH],
-                       ["${seabios_path:-$XENFIRMWAREDIR/bios.bin}"],
+                       ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"],
                        [SeaBIOS path])
 ])
 

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index cf09ad2ea896c4daa3a08f9611afb6f6ea746482..b840c6ab87d72e11e5b0cd100aa3d82a68b35844 100644 (file)
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -42,7 +42,7 @@ install: all
        [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR)
        [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
 ifeq ($(CONFIG_SEABIOS),y)
-       $(INSTALL_DATA) seabios-dir/out/bios.bin $(INST_DIR)/bios.bin
+       $(INSTALL_DATA) seabios-dir/out/bios.bin $(INST_DIR)/seabios.bin
 endif
 ifeq ($(CONFIG_OVMF),y)
        $(INSTALL_DATA) ovmf-dir/ovmf.bin $(INST_DIR)/ovmf.bin